Update emsdk used to 4.0.18 #753
Conversation
| name: CppInterOp-wasm | ||
| channels: | ||
| - https://prefix.dev/emscripten-forge-dev | ||
| - https://prefix.dev/emscripten-forge-4x |
There was a problem hiding this comment.
This change has to be made until Emscripten forges emsdk 4x branch is merged into its main.
| std::vector<Decl*> Decls; | ||
| std::string code = "int f1(int i) { return i * i; }"; | ||
| std::vector<const char*> interpreter_args = {"-include", "new"}; | ||
| std::vector<const char*> interpreter_args = {"-include", "new", "-Xclang", "-iwithsysroot/include/compat"}; |
There was a problem hiding this comment.
Given these extra flags are only needed for the Emscripten case, it might be worth making the args dependent on what platform we are targeting. Same for the other test.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| if (llvm::sys::RunningOnValgrind()) | ||
| GTEST_SKIP() << "XFAIL due to Valgrind report"; | ||
| std::vector<const char*> interpreter_args = { "-include", "new" }; | ||
| std::vector<const char*> interpreter_args = { "-include", "new", "-Xclang", "-iwithsysroot/include/compat" }; |
There was a problem hiding this comment.
warning: no header providing "std::vector" is directly included [misc-include-cleaner]
unittests/CppInterOp/InterpreterTest.cpp:2:
+ #include <vector>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #753 +/- ##
=======================================
Coverage 79.04% 79.04%
=======================================
Files 9 9
Lines 3879 3879
=======================================
Hits 3066 3066
Misses 813 813 🚀 New features to boost your workflow:
|
|
Its not clear why googletest fails to build in the Emscripten ci with this change (see https://github.com/compiler-research/CppInterOp/actions/runs/19363850250/job/55410413357?pr=753#step:9:310). This error doesn't happen locally for me. I will debug (probably next week). |
It fails in the ci but not locally as the googletest in the ci is built with warnings treated as errors. Here is the warning I need to fix when googletest is being built https://github.com/compiler-research/CppInterOp/actions/runs/19366708961/job/55411697302?pr=753#step:9:363 . |
mcbarton
force-pushed
the
Update-emsdk-used-to-version-4.0.9
branch
from
62c3987 to
55c39dc
Compare
cmake/modules/GoogleTest.cmake
Outdated
| GIT_SHALLOW FALSE | ||
| GIT_TAG fa8438ae6b70c57010177de47a9f13d7041a6328 |
There was a problem hiding this comment.
This seemingly random change is a workaround for this bug in Googletest google/googletest#4762 . I got this workaround looking at what others had done to workaround the bug. We are basically fixed to a commit after v1.17 until v1.18 comes out.
|
Things to do as part of this PR
|
mcbarton
force-pushed
the
Update-emsdk-used-to-version-4.0.9
branch
from
bec1d8c to
4954c8e
Compare
|
Hi, just making a note that emscripten-forge's 4-x branch is experimental and subject to version change in the near future. |
| // "float", "double", "long double", "void"} | ||
|
|
||
| std::vector<const char*> interpreter_args = { "-include", "new" }; | ||
| std::vector<const char*> interpreter_args = { "-include", "new", "-Xclang", "-iwithsysroot/include/compat" }; |
There was a problem hiding this comment.
Interestingly this wasn't needed for 4.0.9, but was needed for 4.0.18 even though it appears to be fixing the same problem of xlocale.h not being found for the other tests which needed it for 4.0.9
2 participants
Description
Please include a summary of changes, motivation and context for this PR.
This PR updates CppInterOps Emscripten workflows to emsdk version 4.0.9 . With these changes locally CppInterOps Emscripten build passed all tests, but works is needed in xeus-cpp before this PR will be ready to go in.